Manual merge of version 128.14.0esr-1~deb13u1+rpi1 and 140.7.0esr-1 to produce 140...
authorPeter Michael Green <plugwash@raspbian.org>
Thu, 12 Feb 2026 14:18:22 +0000 (14:18 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Thu, 12 Feb 2026 14:18:22 +0000 (14:18 +0000)
13 files changed:
1  2 
build/moz.configure/arm.configure
build/moz.configure/rust.configure
debian/changelog
debian/patches/series
debian/rules
gfx/qcms/src/lib.rs
gfx/qcms/src/transform.rs
js/moz.configure
js/src/jit/shared/AtomicOperations-shared-jit.cpp
media/libaom/sources.mozbuild
media/libvpx/sources.mozbuild
modules/fdlibm/src/math_private.h
third_party/aom/aom_dsp/aom_dsp.cmake

Simple merge
Simple merge
index 19cfbcc46b1d46b16f42f2fc6a8f4e885b621f00,20cff921bcac117e7a77811f2fe87e3f7ea5c609..09d929e8ff9cf7a725e74ad1a9dab7ac2adf5b28
- firefox-esr (128.14.0esr-1~deb13u1+rpi1) trixie-staging; urgency=medium
++firefox-esr (140.7.0esr-1+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 60.3.0esr-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 05 Dec 2018 06:56:52 +0000]
 +  * Hack broken rust target selection so it produces the right target
 +    on raspbian.
 +  * Fix clean target.
 +
 +  [changes introduce in 60.8.0esr-1+rpi1 by Peter Michael Green]
 +  * Use a fake homedir for build (Closes: 933757).
 +
 +  [changes introduced in 68.2.0esr-1+rpi1 by Peter Michael Green]
 +  * Disable webrtc, it seems to fail to build on raspbian.
 +  * Try to disable Neon
 +
 +  [changes introduced in 78.3.0esr-2+rpi1 by Peter Michael Green]
 +  * Clean up pycache directories.
 +  * Disable neon in qcms.
 +
 +  [changes brought over from thunderbird 1:91.3.2-1+rpi1 by Peter Michael Green]
 +  * Use a #define instead of a typedef for double_t in fdlibm to prevent conflicting
 +    definitions error.
 +
 +  [changes brought over from thunderbird 1:102.1.1-1+rpi1 by Peter Michael Green]
 +  * Disable more armv7/neon stuff.
 +
 +  [changes introduced in 102.2.0esr-1+rpi1 by Peter Michael Green]
 +  * Disable jit (or at least try to)
 +    + Pass disable-jit from debian/rules
 +    + Nerf jit detection in s/moz.configure
 +
 +  [changes introduced in 115.3.0esr-1+rpi1 by Peter Michael Green]
 +  * Disable conflicting include in js/src/jit/shared/AtomicOperations-shared-jit.cpp
 +
 +  [changes introduced in 128.11.0esr-1+rpi1 by Peter Michael Green]
 +  * Update rust target hack to accomodate changes in upstream target selection.
 +  * Workaround asm bug with bx lr (see: https://github.com/EmbarkStudios/crash-handling/issues/5)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 28 Aug 2025 19:08:36 +0000
++ -- Peter Micheal Green <plugwash@raspbian.org>  Thu, 12 Feb 2026 14:17:18 +0000
 +
- firefox-esr (128.14.0esr-1~deb13u1) trixie-security; urgency=medium
+ firefox-esr (140.7.0esr-1) unstable; urgency=medium
  
    * New upstream release.
-   * Fixes for mfsa2025-66, also known as:
-     CVE-2025-9179, CVE-2025-9180, CVE-2025-9181, CVE-2025-9185.
+   * Fixes for mfsa2026-03, also known as:
+     CVE-2026-0877, CVE-2026-0878, CVE-2026-0879, CVE-2026-0880,
+     CVE-2026-0882, CVE-2025-14327, CVE-2026-0883, CVE-2026-0884,
+     CVE-2026-0885, CVE-2026-0886, CVE-2026-0887, CVE-2026-0890,
+     CVE-2026-0891.
  
-  -- Mike Hommey <glandium@debian.org>  Wed, 20 Aug 2025 07:01:10 +0900
+  -- Mike Hommey <glandium@debian.org>  Wed, 14 Jan 2026 08:04:40 +0900
  
- firefox-esr (128.13.0esr-1) unstable; urgency=medium
+ firefox-esr (140.6.0esr-1) unstable; urgency=medium
  
    * New upstream release.
-   * Fixes for mfsa2025-58, also known as:
-     CVE-2025-8027, CVE-2025-8028, CVE-2025-8029, CVE-2025-8030,
-     CVE-2025-8031, CVE-2025-8032, CVE-2025-8033, CVE-2025-8034,
-     CVE-2025-8035.
+   * Fixes for mfsa2025-94, also known as:
+     CVE-2025-14321, CVE-2025-14322, CVE-2025-14323, CVE-2025-14324,
+     CVE-2025-14325, CVE-2025-14328, CVE-2025-14329, CVE-2025-14330,
+     CVE-2025-14331, CVE-2025-14333.
  
-  -- Mike Hommey <glandium@debian.org>  Wed, 23 Jul 2025 06:18:01 +0900
+  -- Mike Hommey <glandium@debian.org>  Wed, 10 Dec 2025 07:02:19 +0900
  
- firefox-esr (128.12.0esr-1) unstable; urgency=medium
+ firefox-esr (140.5.0esr-1) unstable; urgency=medium
  
    * New upstream release.
-   * Fixes for mfsa2025-53, also known as:
-     CVE-2025-6424, CVE-2025-6425, CVE-2025-6429, CVE-2025-6430.
+   * Fixes for mfsa2025-88, also known as:
+     CVE-2025-13012, CVE-2025-13016, CVE-2025-13017, CVE-2025-13018,
+     CVE-2025-13019, CVE-2025-13013, CVE-2025-13020, CVE-2025-13014,
+     CVE-2025-13015.
  
-  -- Mike Hommey <glandium@debian.org>  Wed, 25 Jun 2025 06:15:00 +0900
+  -- Mike Hommey <glandium@debian.org>  Wed, 12 Nov 2025 07:25:00 +0900
  
- firefox-esr (128.11.0esr-1) unstable; urgency=medium
+ firefox-esr (140.4.0esr-1) unstable; urgency=medium
  
    * New upstream release.
-   * Fixes for mfsa2025-44, also known as:
-     CVE-2025-5263, CVE-2025-5264, CVE-2025-5266, CVE-2025-5267,
-     CVE-2025-5268, CVE-2025-5269.
+   * Fixes for mfsa2025-83, also known as:
+     CVE-2025-11708, CVE-2025-11709, CVE-2025-11710, CVE-2025-11711,
+     CVE-2025-11712, CVE-2025-11714, CVE-2025-11715.
  
-  -- Mike Hommey <glandium@debian.org>  Wed, 28 May 2025 10:55:09 +0900
+   * debian/watch: Refreshed. Somehow it was not refreshed for ESR.
+   * debian/dh: Properly handle multiple DEB_BUILD_OPTIONS.
  
- firefox-esr (128.10.1esr-1) unstable; urgency=medium
+  -- Mike Hommey <glandium@debian.org>  Wed, 15 Oct 2025 08:55:29 +0900
+ firefox-esr (140.3.1esr-2) unstable; urgency=medium
+   * media/libyuv/libyuv/libyuv.gyp: Disable SVE parts of libyuv when the
+     SVE flags are not supported. Fixes FTBFS on arm64 on bookworm.
+   * config/system-headers.mozbuild: Add a system header wrapper for
+     sys/platform/ppc.h.: Fixes FTBFS on pc64el on bookworm.
+   * debian/rules: Disable rust LTO on s390x, hoping to fix FTBFS.
+  -- Mike Hommey <glandium@debian.org>  Sat, 27 Sep 2025 09:57:32 +0900
+ firefox-esr (140.3.1esr-1) unstable; urgency=medium
  
    * New upstream release.
-   * Fixes for mfsa2025-37, also known as CVE-2025-4920, CVE-2025-4921.
  
-  -- Mike Hommey <glandium@debian.org>  Sun, 18 May 2025 06:41:48 +0900
+  -- Mike Hommey <glandium@debian.org>  Wed, 24 Sep 2025 10:25:49 +0900
+ firefox-esr (140.3.0esr-2) unstable; urgency=medium
+   * debian/upstream.mk, debian/control: Stop handling testing/unstable
+     as trixie, meaning embedded NSS is not built anymore.
+   * debian/rules:
+     - Avoid running dwz on platforms where we disable debug info.
+       Closes: #1115490
+     - Stop setting _LEAKTEST_FILES, it hasn't been used since version 32.0.
+  -- Mike Hommey <glandium@debian.org>  Thu, 18 Sep 2025 13:28:10 +0900
  
- firefox-esr (128.10.0esr-1) unstable; urgency=medium
+ firefox-esr (140.3.0esr-1) unstable; urgency=medium
  
    * New upstream release.
-   * Fixes for mfsa2025-29, also known as:
-     CVE-2025-4083, CVE-2025-4087, CVE-2025-4091, CVE-2025-4093.
+   * Fixes for mfsa2025-75, also known as:
+     CVE-2025-10527, CVE-2025-10528, CVE-2025-10529, CVE-2025-10532,
+     CVE-2025-10533, CVE-2025-10536, CVE-2025-10537.
  
-  -- Mike Hommey <glandium@debian.org>  Wed, 30 Apr 2025 07:50:47 +0900
+  -- Mike Hommey <glandium@debian.org>  Wed, 17 Sep 2025 08:35:15 +0900
  
- firefox-esr (128.9.0esr-2) unstable; urgency=medium
+ firefox (140.0.4-1) unstable; urgency=medium
  
-   * debian/rules: Fix application icon names.
+   * New upstream release.
+  -- Mike Hommey <glandium@debian.org>  Wed, 09 Jul 2025 07:58:40 +0900
+ firefox (140.0.1-1) unstable; urgency=medium
+   * New upstream release.
+   * debian/control*: Bump nss build dependency.
  
-  -- Mike Hommey <glandium@debian.org>  Wed, 02 Apr 2025 10:53:57 +0900
+  -- Mike Hommey <glandium@debian.org>  Fri, 27 Jun 2025 06:34:37 +0900
  
- firefox-esr (128.9.0esr-1) unstable; urgency=medium
+ firefox (140.0-1) unstable; urgency=medium
  
    * New upstream release.
-   * Fixes for mfsa2025-22, also known as:
-     CVE-2025-3028, CVE-2025-3029, CVE-2025-3030.
+   * Fixes for mfsa2025-51, also known as:
+     CVE-2025-6424, CVE-2025-6425, CVE-2025-6427, CVE-2025-6429,
+     CVE-2025-6430, CVE-2025-6432, CVE-2025-6433, CVE-2025-6434,
+     CVE-2025-6435, CVE-2025-6436.
+  -- Mike Hommey <glandium@debian.org>  Wed, 25 Jun 2025 06:27:19 +0900
+ firefox (139.0.4-1) unstable; urgency=medium
+   * New upstream release.
+   * Fixes for mfsa2025-47, also known as: CVE-2025-49709, CVE-2025-49710.
+  -- Mike Hommey <glandium@debian.org>  Wed, 11 Jun 2025 07:24:30 +0900
+ firefox (139.0-1) unstable; urgency=medium
+   * New upstream release.
+   * Fixes for mfsa2025-42, also known as:
+     CVE-2025-5263, CVE-2025-5264, CVE-2025-5266, CVE-2025-5270,
+     CVE-2025-5271, CVE-2025-5267, CVE-2025-5268, CVE-2025-5272.
+   * debian/browser.install.in: Add crashhelper binary.
+  -- Mike Hommey <glandium@debian.org>  Wed, 28 May 2025 11:15:15 +0900
+ firefox (138.0.4-1) unstable; urgency=medium
+   * New upstream release.
+   * Fixes for mfsa2025-36, also known as CVE-2025-4920, CVE-2025-4921.
+  -- Mike Hommey <glandium@debian.org>  Sun, 18 May 2025 06:50:18 +0900
+ firefox (138.0.3-1) unstable; urgency=medium
+   * New upstream release.
+   * debian/browser.mozconfig.in, debian/rules: Disable wasm sandboxing on big
+     endian architectures. Thanks John Paul Adrian Glaubitz. Closes: #1105086
+   * debian/rules: Force-use BFD ld on ppc64. Closes: #1105090
  
+  -- Mike Hommey <glandium@debian.org>  Wed, 14 May 2025 05:53:10 +0900
+ firefox (138.0.1-1) unstable; urgency=medium
+   * New upstream release.
+  -- Mike Hommey <glandium@debian.org>  Fri, 02 May 2025 10:00:46 +0900
+ firefox (138.0-1) unstable; urgency=medium
+   * New upstream release.
+   * Fixes for mfsa2025-28, also known as:
+     CVE-2025-4083, CVE-2025-4085, CVE-2025-4087, CVE-2025-4088,
+     CVE-2025-4089, CVE-2025-4091, CVE-2025-4092.
+   * debian/control*: Bump nss and cbindgen build dependencies.
+   * debian/browser.install.in: Don't install now removed
+     /usr/lib/firefox/browser/features.
+   * build/moz.configure/bindgen.configure: Relax cbindgen build dependency.
+  -- Mike Hommey <glandium@debian.org>  Wed, 30 Apr 2025 09:50:07 +0900
+ firefox (137.0.2-1) unstable; urgency=medium
+   * New upstream release.
+   * Fixes for mfsa2025-25, also known as CVE-2025-3608.
+  -- Mike Hommey <glandium@debian.org>  Wed, 16 Apr 2025 07:22:29 +0900
+ firefox (137.0.1-1) unstable; urgency=medium
+   * New upstream release.
+  -- Mike Hommey <glandium@debian.org>  Wed, 09 Apr 2025 05:17:00 +0900
+ firefox (137.0-1) unstable; urgency=medium
+   * New upstream release.
+   * Fixes for mfsa2025-20, also known as:
+     CVE-2025-3028, CVE-2025-3031, CVE-2025-3032, CVE-2025-3029,
+     CVE-2025-3035, CVE-2025-3030, CVE-2025-3034.
+   * debian/control*: Bump nss and rustc build dependencies.
    * debian/browser.dirs.in, debian/browser.links.in, debian/rules: Move
      desktop icons to /usr/share/icons/hicolor/* and symlink them from
-     /usr/lib/$browser/browser/chrome/icons/default. Closes: #1091523.
+     /usr/lib/$browser/browser/chrome/icons/default.
+   * debian/browser.install.in: Remove libipcclientcerts.so and libnssckbi.so.
+  -- Mike Hommey <glandium@debian.org>  Wed, 02 Apr 2025 06:09:15 +0900
+ firefox (136.0.3-1) unstable; urgency=medium
+   * New upstream release.
+  -- Mike Hommey <glandium@debian.org>  Wed, 26 Mar 2025 05:43:49 +0900
+ firefox (136.0.2-1) unstable; urgency=medium
+   * New upstream release.
+  -- Mike Hommey <glandium@debian.org>  Wed, 19 Mar 2025 04:50:38 +0900
+ firefox (136.0.1-1) unstable; urgency=medium
  
-  -- Mike Hommey <glandium@debian.org>  Wed, 02 Apr 2025 05:45:12 +0900
+   * New upstream release.
+  -- Mike Hommey <glandium@debian.org>  Wed, 12 Mar 2025 05:29:58 +0900
  
- firefox-esr (128.8.0esr-1) unstable; urgency=medium
+ firefox (136.0-1) unstable; urgency=medium
  
    * New upstream release.
-   * Fixes for mfsa2025-16, also known as:
-     CVE-2024-43097, CVE-2025-1931, CVE-2025-1932, CVE-2025-1933,
-     CVE-2025-1934, CVE-2025-1935, CVE-2025-1936, CVE-2025-1937,
-     CVE-2025-1938.
+   * Fixes for mfsa2025-15, also known as:
+     CVE-2025-1931, CVE-2025-1932, CVE-2025-1933, CVE-2025-1934,
+     CVE-2025-1942, CVE-2025-1935, CVE-2025-1936, CVE-2025-1937,
+     CVE-2025-1938, CVE-2025-1943.
+   * debian/control*: Bump nss build dependency.
  
-  -- Mike Hommey <glandium@debian.org>  Wed, 05 Mar 2025 05:39:57 +0900
+   * js/src/xsum/moz.build: Disable format-security warning when disabling
+     format warning.
  
- firefox-esr (128.7.0esr-1) unstable; urgency=medium
+  -- Mike Hommey <glandium@debian.org>  Wed, 05 Mar 2025 07:17:24 +0900
+ firefox (135.0.1-1) unstable; urgency=medium
  
    * New upstream release.
-   * Fixes for mfsa2025-09, also known as:
-     CVE-2025-1009, CVE-2025-1010, CVE-2025-1011, CVE-2025-1012,
-     CVE-2025-1013, CVE-2025-1014, CVE-2025-1016, CVE-2025-1017.
  
-  -- Mike Hommey <glandium@debian.org>  Wed, 05 Feb 2025 06:07:22 +0900
+  -- Mike Hommey <glandium@debian.org>  Wed, 19 Feb 2025 05:34:58 +0900
+ firefox (135.0-1) unstable; urgency=medium
+   * New upstream release.
+   * Fixes for mfsa2025-07, also known as:
+     CVE-2025-1009, CVE-2025-1010, CVE-2025-1018, CVE-2025-1011,
+     CVE-2025-1012, CVE-2025-1019, CVE-2025-1013, CVE-2025-1014,
+     CVE-2025-1016, CVE-2025-1017, CVE-2025-1020.
+  -- Mike Hommey <glandium@debian.org>  Wed, 05 Feb 2025 06:42:43 +0900
+ firefox (134.0.2-3) unstable; urgency=medium
  
- firefox-esr (128.6.0esr-4) unstable; urgency=medium
+   * mozglue/misc/StackWalk.cpp: Work around glibc issue leading to crash in
+     _Unwind_Backtrace on aarch64 linux with PAC. bz#1944461. Closes: #1094429.
  
+  -- Mike Hommey <glandium@debian.org>  Thu, 30 Jan 2025 05:53:20 +0900
+ firefox (134.0.2-2) unstable; urgency=medium
+   * gfx/cairo/libpixman/src/moz.build: Don't use clang clang's integrated
+     assembler to compile pixman ARM neon code.
+   * gfx/ycbcr/yuv_convert_arm.cpp: Move the .fpu neon directive around.
    * third_party/wasm2c/src/prebuilt/wasm2c_simd_source_declarations.cc,
      third_party/wasm2c/src/prebuilt/wasm2c_source_declarations.cc: Apply
      wasm2c upstream fix for clang targetting mips.
index e9e3bae1f053330d91ccf3228194464e1f17465f,3b3130a36fd7b4a3d685964176d207c1ee19a6c1..165da3abeb9e43b6e3471622ba648527fc8d3b61
@@@ -18,12 -15,4 +15,13 @@@ debian-hacks/Set-DPI-to-system-settings
  debian-hacks/Don-t-auto-disable-extensions-in-system-directories.patch
  debian-hacks/Work-around-GCC-ICE-on-ppc64el.patch
  debian-hacks/Adjust-our-gfx-skia-moz.build-patch-to-upstream-chan.patch
+ debian-hacks/Disable-format-security-warning-when-disabling-forma.patch
 +raspbian-rust-triplet-hack.patch
 +try-to-disable-neon.patch
 +try-harder-to-disable-neon.patch
 +disable-neon-in-qcms.patch
 +use-a-define-instead-of-a-typedef-for-do.patch
 +disable-more-armv7neon-stuff.patch
 +disable-jit.patch
 +disable-conflicting-include.patch
 +workaround-bx-inline-asm-bug.patch
diff --cc debian/rules
index ece76cc17090d1d07704e9e5e6aee50d93808f8e,c5a1d81aa57a4f86e48b04bb8839aa35c5976f71..202ff03f3483ba223930ad44861966c1272dbef4
@@@ -111,9 -110,12 +112,12 @@@ endi
  ifneq (,$(filter i386 amd64 armel armhf arm64,$(DEB_HOST_ARCH)))
        CRASH_REPORTER = 1
  endif
 -ifneq (,$(filter mips%,$(DEB_HOST_ARCH)))
 +ifneq (,$(filter armhf mips%,$(DEB_HOST_ARCH)))
        CONFIGURE_FLAGS += --disable-webrtc
  endif
+ ifneq (,$(filter ppc64,$(DEB_HOST_ARCH)))
+       CONFIGURE_FLAGS += --enable-linker=bfd
+ endif
  
  ifeq (default,$(origin CC))
  ifneq (,$(filter-out bullseye bookworm,$(DIST)))
Simple merge
Simple merge
index 16f97c78b24e6c67ed9dd7ad990986cc88c67c2f,7a9506d1fe3e1846da5a7cce0899215acfc01b41..55c3aa53d7da6af811ab8e0ad61edee574726dab
@@@ -239,34 -235,19 +235,19 @@@ set_config
  
  # JIT support
  # =======================================================
- @depends(
-     target,
-     "--enable-record-tuple",
-     "--enable-portable-baseline-interp",
-     "--enable-explicit-resource-management",
- )
- def jit_default(
-     target,
-     enable_record_tuple,
-     enable_portable_baseline_interp,
-     enable_explicit_resource_management,
- ):
-     #if enable_record_tuple:
-     #    return False
+ @depends(target, "--enable-portable-baseline-interp")
+ def jit_default(target, enable_portable_baseline_interp):
 -    if enable_portable_baseline_interp:
 -        return False
 -    if target.cpu in (
 -        "x86",
 -        "x86_64",
 -        "arm",
 -        "aarch64",
 -        "mips64",
 -        "loongarch64",
 -    ):
 -        return True
 +    #if enable_portable_baseline_interp:
 +    #    return False
-     #if enable_explicit_resource_management:
-     #    return False
 +    #if target.cpu in (
 +    #    "x86",
 +    #    "x86_64",
 +    #    "arm",
 +    #    "aarch64",
-     #    "mips32",
 +    #    "mips64",
 +    #    "loongarch64",
 +    #):
 +    #    return True
      return False
  
  
index 02a5d3f003e497a7dfaa534633c5b3df7e587745,d0a2f0c887c1e0d9f75708d7fe1b1e8e48fdf8cb..fc495f1b6b74cd812a862f11b6f2aaeb5df270f5
@@@ -4,11 -4,23 +4,23 @@@
   * License, v. 2.0. If a copy of the MPL was not distributed with this
   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  
+ #include "mozilla/Assertions.h"
+ #include "mozilla/Attributes.h"
+ #include "mozilla/MathAlgorithms.h"
+ #include <atomic>
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <stdlib.h>
+ #include <tuple>
+ #include <utility>
  #include "jit/AtomicOperations.h"
+ #include "js/GCAPI.h"
  
 -#if defined(__arm__)
 -#  include "jit/arm/Architecture-arm.h"
 -#endif
 +//#if defined(__arm__)
 +//#  include "jit/arm/Architecture-arm.h"
 +//#endif
  
  #ifdef JS_HAVE_GENERATED_ATOMIC_OPS
  
@@@ -55,8 -63,7 +63,8 @@@ static bool UnalignedAccessesAreOK() 
  #  if defined(__x86_64__) || defined(__i386__)
    return true;
  #  elif defined(__arm__)
-   //return !HasAlignmentFault();
 -  return !ARMFlags::HasAlignmentFault();
++  //return !ARMFlags::HasAlignmentFault();
 +  return false;
  #  elif defined(__aarch64__)
    // This is not necessarily true but it's the best guess right now.
    return true;
index 1bd6308910f4c9c66d797adbb468fb8aa701c4b2,ed66596a5201d08ef9cad1b349729ddde8ae3e90..11258e19da256503643a59d500d5ee619a0a9044
@@@ -1,25 -1,291 +1,6 @@@
  # This file is generated. Do not edit.
  
  files = {
 -  'ARM_EXPORTS': [
 -    '../../third_party/aom/aom/aom.h',
 -    '../../third_party/aom/aom/aom_codec.h',
 -    '../../third_party/aom/aom/aom_decoder.h',
 -    '../../third_party/aom/aom/aom_encoder.h',
 -    '../../third_party/aom/aom/aom_external_partition.h',
 -    '../../third_party/aom/aom/aom_frame_buffer.h',
 -    '../../third_party/aom/aom/aom_image.h',
 -    '../../third_party/aom/aom/aom_integer.h',
 -    '../../third_party/aom/aom/aomcx.h',
 -    '../../third_party/aom/aom/aomdx.h',
 -    '../../third_party/aom/aom_mem/aom_mem.h',
 -    '../../third_party/aom/aom_ports/aom_timer.h',
 -    '../../third_party/aom/aom_ports/bitops.h',
 -    '../../third_party/aom/aom_ports/mem.h',
 -    '../../third_party/aom/aom_ports/sanitizer.h',
 -    '../../third_party/aom/aom_scale/yv12config.h',
 -  ],
 -  'ARM_SOURCES': [
 -    '../../third_party/aom/aom/src/aom_codec.c',
 -    '../../third_party/aom/aom/src/aom_decoder.c',
 -    '../../third_party/aom/aom/src/aom_encoder.c',
 -    '../../third_party/aom/aom/src/aom_image.c',
 -    '../../third_party/aom/aom/src/aom_integer.c',
 -    '../../third_party/aom/aom_dsp/aom_convolve.c',
 -    '../../third_party/aom/aom_dsp/aom_dsp_rtcd.c',
 -    '../../third_party/aom/aom_dsp/arm/aom_convolve8_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/aom_convolve_copy_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/aom_scaled_convolve8_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/avg_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/avg_pred_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/blend_a64_mask_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/blk_sse_sum_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/fwd_txfm_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/hadamard_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_avg_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_avg_pred_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_blend_a64_hmask_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_blend_a64_mask_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_blend_a64_vmask_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_convolve8_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_hadamard_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_intrapred_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_loopfilter_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_masked_sad_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_obmc_sad_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_obmc_variance_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_quantize_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_sad_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_sadxd_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_sse_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_subpel_variance_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/highbd_variance_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/intrapred_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/loopfilter_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/masked_sad_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/obmc_sad_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/obmc_variance_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/sad_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/sadxd_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/sse_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/subpel_variance_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/subtract_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/sum_squares_neon.c',
 -    '../../third_party/aom/aom_dsp/arm/variance_neon.c',
 -    '../../third_party/aom/aom_dsp/avg.c',
 -    '../../third_party/aom/aom_dsp/binary_codes_reader.c',
 -    '../../third_party/aom/aom_dsp/binary_codes_writer.c',
 -    '../../third_party/aom/aom_dsp/bitreader.c',
 -    '../../third_party/aom/aom_dsp/bitreader_buffer.c',
 -    '../../third_party/aom/aom_dsp/bitwriter.c',
 -    '../../third_party/aom/aom_dsp/bitwriter_buffer.c',
 -    '../../third_party/aom/aom_dsp/blend_a64_hmask.c',
 -    '../../third_party/aom/aom_dsp/blend_a64_mask.c',
 -    '../../third_party/aom/aom_dsp/blend_a64_vmask.c',
 -    '../../third_party/aom/aom_dsp/blk_sse_sum.c',
 -    '../../third_party/aom/aom_dsp/entcode.c',
 -    '../../third_party/aom/aom_dsp/entdec.c',
 -    '../../third_party/aom/aom_dsp/entenc.c',
 -    '../../third_party/aom/aom_dsp/fft.c',
 -    '../../third_party/aom/aom_dsp/flow_estimation/arm/disflow_neon.c',
 -    '../../third_party/aom/aom_dsp/flow_estimation/corner_detect.c',
 -    '../../third_party/aom/aom_dsp/flow_estimation/corner_match.c',
 -    '../../third_party/aom/aom_dsp/flow_estimation/disflow.c',
 -    '../../third_party/aom/aom_dsp/flow_estimation/flow_estimation.c',
 -    '../../third_party/aom/aom_dsp/flow_estimation/ransac.c',
 -    '../../third_party/aom/aom_dsp/fwd_txfm.c',
 -    '../../third_party/aom/aom_dsp/grain_table.c',
 -    '../../third_party/aom/aom_dsp/intrapred.c',
 -    '../../third_party/aom/aom_dsp/loopfilter.c',
 -    '../../third_party/aom/aom_dsp/noise_model.c',
 -    '../../third_party/aom/aom_dsp/noise_util.c',
 -    '../../third_party/aom/aom_dsp/odintrin.c',
 -    '../../third_party/aom/aom_dsp/psnr.c',
 -    '../../third_party/aom/aom_dsp/pyramid.c',
 -    '../../third_party/aom/aom_dsp/quantize.c',
 -    '../../third_party/aom/aom_dsp/sad.c',
 -    '../../third_party/aom/aom_dsp/sad_av1.c',
 -    '../../third_party/aom/aom_dsp/sse.c',
 -    '../../third_party/aom/aom_dsp/ssim.c',
 -    '../../third_party/aom/aom_dsp/subtract.c',
 -    '../../third_party/aom/aom_dsp/sum_squares.c',
 -    '../../third_party/aom/aom_dsp/variance.c',
 -    '../../third_party/aom/aom_mem/aom_mem.c',
 -    '../../third_party/aom/aom_ports/aarch32_cpudetect.c',
 -    '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
 -    '../../third_party/aom/aom_scale/generic/yv12config.c',
 -    '../../third_party/aom/aom_scale/generic/yv12extend.c',
 -    '../../third_party/aom/aom_util/aom_thread.c',
 -    '../../third_party/aom/av1/arg_defs.c',
 -    '../../third_party/aom/av1/av1_cx_iface.c',
 -    '../../third_party/aom/av1/av1_dx_iface.c',
 -    '../../third_party/aom/av1/common/alloccommon.c',
 -    '../../third_party/aom/av1/common/arm/av1_convolve_horiz_rs_neon.c',
 -    '../../third_party/aom/av1/common/arm/av1_convolve_scale_neon.c',
 -    '../../third_party/aom/av1/common/arm/av1_inv_txfm_neon.c',
 -    '../../third_party/aom/av1/common/arm/av1_txfm_neon.c',
 -    '../../third_party/aom/av1/common/arm/blend_a64_hmask_neon.c',
 -    '../../third_party/aom/av1/common/arm/blend_a64_vmask_neon.c',
 -    '../../third_party/aom/av1/common/arm/cdef_block_neon.c',
 -    '../../third_party/aom/av1/common/arm/cfl_neon.c',
 -    '../../third_party/aom/av1/common/arm/compound_convolve_neon.c',
 -    '../../third_party/aom/av1/common/arm/convolve_neon.c',
 -    '../../third_party/aom/av1/common/arm/highbd_compound_convolve_neon.c',
 -    '../../third_party/aom/av1/common/arm/highbd_convolve_horiz_rs_neon.c',
 -    '../../third_party/aom/av1/common/arm/highbd_convolve_neon.c',
 -    '../../third_party/aom/av1/common/arm/highbd_convolve_scale_neon.c',
 -    '../../third_party/aom/av1/common/arm/highbd_inv_txfm_neon.c',
 -    '../../third_party/aom/av1/common/arm/highbd_reconinter_neon.c',
 -    '../../third_party/aom/av1/common/arm/highbd_reconintra_neon.c',
 -    '../../third_party/aom/av1/common/arm/highbd_warp_plane_neon.c',
 -    '../../third_party/aom/av1/common/arm/highbd_wiener_convolve_neon.c',
 -    '../../third_party/aom/av1/common/arm/reconinter_neon.c',
 -    '../../third_party/aom/av1/common/arm/reconintra_neon.c',
 -    '../../third_party/aom/av1/common/arm/resize_neon.c',
 -    '../../third_party/aom/av1/common/arm/selfguided_neon.c',
 -    '../../third_party/aom/av1/common/arm/warp_plane_neon.c',
 -    '../../third_party/aom/av1/common/arm/wiener_convolve_neon.c',
 -    '../../third_party/aom/av1/common/av1_inv_txfm1d.c',
 -    '../../third_party/aom/av1/common/av1_inv_txfm2d.c',
 -    '../../third_party/aom/av1/common/av1_loopfilter.c',
 -    '../../third_party/aom/av1/common/av1_rtcd.c',
 -    '../../third_party/aom/av1/common/av1_txfm.c',
 -    '../../third_party/aom/av1/common/blockd.c',
 -    '../../third_party/aom/av1/common/cdef.c',
 -    '../../third_party/aom/av1/common/cdef_block.c',
 -    '../../third_party/aom/av1/common/cfl.c',
 -    '../../third_party/aom/av1/common/common_data.c',
 -    '../../third_party/aom/av1/common/convolve.c',
 -    '../../third_party/aom/av1/common/debugmodes.c',
 -    '../../third_party/aom/av1/common/entropy.c',
 -    '../../third_party/aom/av1/common/entropymode.c',
 -    '../../third_party/aom/av1/common/entropymv.c',
 -    '../../third_party/aom/av1/common/frame_buffers.c',
 -    '../../third_party/aom/av1/common/idct.c',
 -    '../../third_party/aom/av1/common/mvref_common.c',
 -    '../../third_party/aom/av1/common/obu_util.c',
 -    '../../third_party/aom/av1/common/pred_common.c',
 -    '../../third_party/aom/av1/common/quant_common.c',
 -    '../../third_party/aom/av1/common/reconinter.c',
 -    '../../third_party/aom/av1/common/reconintra.c',
 -    '../../third_party/aom/av1/common/resize.c',
 -    '../../third_party/aom/av1/common/restoration.c',
 -    '../../third_party/aom/av1/common/scale.c',
 -    '../../third_party/aom/av1/common/scan.c',
 -    '../../third_party/aom/av1/common/seg_common.c',
 -    '../../third_party/aom/av1/common/thread_common.c',
 -    '../../third_party/aom/av1/common/tile_common.c',
 -    '../../third_party/aom/av1/common/timing.c',
 -    '../../third_party/aom/av1/common/txb_common.c',
 -    '../../third_party/aom/av1/common/warped_motion.c',
 -    '../../third_party/aom/av1/decoder/decodeframe.c',
 -    '../../third_party/aom/av1/decoder/decodemv.c',
 -    '../../third_party/aom/av1/decoder/decoder.c',
 -    '../../third_party/aom/av1/decoder/decodetxb.c',
 -    '../../third_party/aom/av1/decoder/detokenize.c',
 -    '../../third_party/aom/av1/decoder/grain_synthesis.c',
 -    '../../third_party/aom/av1/decoder/obu.c',
 -    '../../third_party/aom/av1/encoder/allintra_vis.c',
 -    '../../third_party/aom/av1/encoder/aq_complexity.c',
 -    '../../third_party/aom/av1/encoder/aq_cyclicrefresh.c',
 -    '../../third_party/aom/av1/encoder/aq_variance.c',
 -    '../../third_party/aom/av1/encoder/arm/av1_error_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/av1_fwd_txfm2d_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/av1_highbd_quantize_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/av1_k_means_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/cnn_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/encodetxb_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/highbd_fwd_txfm_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/highbd_pickrst_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/highbd_rdopt_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/highbd_temporal_filter_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/hybrid_fwd_txfm_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/ml_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/pickrst_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/quantize_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/rdopt_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/reconinter_enc_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/temporal_filter_neon.c',
 -    '../../third_party/aom/av1/encoder/arm/wedge_utils_neon.c',
 -    '../../third_party/aom/av1/encoder/av1_fwd_txfm1d.c',
 -    '../../third_party/aom/av1/encoder/av1_fwd_txfm2d.c',
 -    '../../third_party/aom/av1/encoder/av1_noise_estimate.c',
 -    '../../third_party/aom/av1/encoder/av1_quantize.c',
 -    '../../third_party/aom/av1/encoder/bitstream.c',
 -    '../../third_party/aom/av1/encoder/cnn.c',
 -    '../../third_party/aom/av1/encoder/compound_type.c',
 -    '../../third_party/aom/av1/encoder/context_tree.c',
 -    '../../third_party/aom/av1/encoder/cost.c',
 -    '../../third_party/aom/av1/encoder/dwt.c',
 -    '../../third_party/aom/av1/encoder/encode_strategy.c',
 -    '../../third_party/aom/av1/encoder/encodeframe.c',
 -    '../../third_party/aom/av1/encoder/encodeframe_utils.c',
 -    '../../third_party/aom/av1/encoder/encodemb.c',
 -    '../../third_party/aom/av1/encoder/encodemv.c',
 -    '../../third_party/aom/av1/encoder/encoder.c',
 -    '../../third_party/aom/av1/encoder/encoder_utils.c',
 -    '../../third_party/aom/av1/encoder/encodetxb.c',
 -    '../../third_party/aom/av1/encoder/ethread.c',
 -    '../../third_party/aom/av1/encoder/extend.c',
 -    '../../third_party/aom/av1/encoder/external_partition.c',
 -    '../../third_party/aom/av1/encoder/firstpass.c',
 -    '../../third_party/aom/av1/encoder/global_motion.c',
 -    '../../third_party/aom/av1/encoder/global_motion_facade.c',
 -    '../../third_party/aom/av1/encoder/gop_structure.c',
 -    '../../third_party/aom/av1/encoder/hash.c',
 -    '../../third_party/aom/av1/encoder/hash_motion.c',
 -    '../../third_party/aom/av1/encoder/hybrid_fwd_txfm.c',
 -    '../../third_party/aom/av1/encoder/interp_search.c',
 -    '../../third_party/aom/av1/encoder/intra_mode_search.c',
 -    '../../third_party/aom/av1/encoder/level.c',
 -    '../../third_party/aom/av1/encoder/lookahead.c',
 -    '../../third_party/aom/av1/encoder/mcomp.c',
 -    '../../third_party/aom/av1/encoder/ml.c',
 -    '../../third_party/aom/av1/encoder/motion_search_facade.c',
 -    '../../third_party/aom/av1/encoder/mv_prec.c',
 -    '../../third_party/aom/av1/encoder/nonrd_opt.c',
 -    '../../third_party/aom/av1/encoder/nonrd_pickmode.c',
 -    '../../third_party/aom/av1/encoder/palette.c',
 -    '../../third_party/aom/av1/encoder/partition_search.c',
 -    '../../third_party/aom/av1/encoder/partition_strategy.c',
 -    '../../third_party/aom/av1/encoder/pass2_strategy.c',
 -    '../../third_party/aom/av1/encoder/pickcdef.c',
 -    '../../third_party/aom/av1/encoder/picklpf.c',
 -    '../../third_party/aom/av1/encoder/pickrst.c',
 -    '../../third_party/aom/av1/encoder/ratectrl.c',
 -    '../../third_party/aom/av1/encoder/rd.c',
 -    '../../third_party/aom/av1/encoder/rdopt.c',
 -    '../../third_party/aom/av1/encoder/reconinter_enc.c',
 -    '../../third_party/aom/av1/encoder/segmentation.c',
 -    '../../third_party/aom/av1/encoder/speed_features.c',
 -    '../../third_party/aom/av1/encoder/superres_scale.c',
 -    '../../third_party/aom/av1/encoder/svc_layercontext.c',
 -    '../../third_party/aom/av1/encoder/temporal_filter.c',
 -    '../../third_party/aom/av1/encoder/tokenize.c',
 -    '../../third_party/aom/av1/encoder/tpl_model.c',
 -    '../../third_party/aom/av1/encoder/tx_search.c',
 -    '../../third_party/aom/av1/encoder/txb_rdopt.c',
 -    '../../third_party/aom/av1/encoder/var_based_part.c',
 -    '../../third_party/aom/av1/encoder/wedge_utils.c',
 -    '../../third_party/aom/av1/ratectrl_rtc.cc',
 -    '../../third_party/aom/common/args_helper.c',
 -    '../../third_party/aom/third_party/fastfeat/fast.c',
 -    '../../third_party/aom/third_party/fastfeat/fast_9.c',
 -    '../../third_party/aom/third_party/fastfeat/nonmax.c',
 -    '../../third_party/aom/third_party/vector/vector.c',
 -  ],
--  'ARM64_EXPORTS': [
--    '../../third_party/aom/aom/aom.h',
--    '../../third_party/aom/aom/aom_codec.h',
--    '../../third_party/aom/aom/aom_decoder.h',
--    '../../third_party/aom/aom/aom_encoder.h',
--    '../../third_party/aom/aom/aom_external_partition.h',
--    '../../third_party/aom/aom/aom_frame_buffer.h',
--    '../../third_party/aom/aom/aom_image.h',
--    '../../third_party/aom/aom/aom_integer.h',
--    '../../third_party/aom/aom/aomcx.h',
--    '../../third_party/aom/aom/aomdx.h',
--    '../../third_party/aom/aom_mem/aom_mem.h',
--    '../../third_party/aom/aom_ports/aom_timer.h',
--    '../../third_party/aom/aom_ports/bitops.h',
--    '../../third_party/aom/aom_ports/mem.h',
--    '../../third_party/aom/aom_ports/sanitizer.h',
-     '../../third_party/aom/aom_scale/aom_scale.h',
--    '../../third_party/aom/aom_scale/yv12config.h',
--  ],
    'ARM64_SOURCES': [
      '../../third_party/aom/aom/src/aom_codec.c',
      '../../third_party/aom/aom/src/aom_decoder.c',
Simple merge
Simple merge
index aaa73e20232c2bab581324b8a6279bb91c41c00d,9ceb10990d0bb697c27fa4e37b9e10fff07f7e5a..58b609815b80fb56045515ee23412aa8538e2bd9
@@@ -98,29 -95,32 +95,32 @@@ list(APPEND AOM_DSP_COMMON_INTRIN_AVX
              "${AOM_ROOT}/aom_dsp/x86/intrapred_avx2.c"
              "${AOM_ROOT}/aom_dsp/x86/loopfilter_avx2.c"
              "${AOM_ROOT}/aom_dsp/x86/blend_a64_mask_avx2.c"
-             "${AOM_ROOT}/aom_dsp/x86/bitdepth_conversion_avx2.h"
-             "${AOM_ROOT}/third_party/SVT-AV1/convolve_2d_avx2.h"
-             "${AOM_ROOT}/third_party/SVT-AV1/convolve_avx2.h"
-             "${AOM_ROOT}/third_party/SVT-AV1/EbMemory_AVX2.h"
-             "${AOM_ROOT}/third_party/SVT-AV1/EbMemory_SSE4_1.h"
-             "${AOM_ROOT}/third_party/SVT-AV1/synonyms.h")
+             "${AOM_ROOT}/aom_dsp/x86/bitdepth_conversion_avx2.h")
+ if(CONFIG_SVT_AV1)
+   list(APPEND AOM_DSP_COMMON_INTRIN_AVX2
+               "${AOM_ROOT}/third_party/SVT-AV1/convolve_2d_avx2.h"
+               "${AOM_ROOT}/third_party/SVT-AV1/convolve_avx2.h"
+               "${AOM_ROOT}/third_party/SVT-AV1/EbMemory_AVX2.h"
+               "${AOM_ROOT}/third_party/SVT-AV1/EbMemory_SSE4_1.h"
+               "${AOM_ROOT}/third_party/SVT-AV1/synonyms.h")
+ endif()
  
 -list(APPEND AOM_DSP_COMMON_INTRIN_NEON
 -            "${AOM_ROOT}/aom_dsp/arm/aom_convolve_copy_neon.c"
 -            "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_neon.c"
 -            "${AOM_ROOT}/aom_dsp/arm/aom_scaled_convolve8_neon.c"
 -            "${AOM_ROOT}/aom_dsp/arm/loopfilter_neon.c"
 -            "${AOM_ROOT}/aom_dsp/arm/intrapred_neon.c"
 -            "${AOM_ROOT}/aom_dsp/arm/blend_a64_mask_neon.c")
 +#list(APPEND AOM_DSP_COMMON_INTRIN_NEON
 +#            "${AOM_ROOT}/aom_dsp/arm/aom_convolve_copy_neon.c"
 +#            "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_neon.c"
- #            "${AOM_ROOT}/aom_dsp/arm/fwd_txfm_neon.c"
++#            "${AOM_ROOT}/aom_dsp/arm/aom_scaled_convolve8_neon.c"
 +#            "${AOM_ROOT}/aom_dsp/arm/loopfilter_neon.c"
 +#            "${AOM_ROOT}/aom_dsp/arm/intrapred_neon.c"
- #            "${AOM_ROOT}/aom_dsp/arm/subtract_neon.c"
- #            "${AOM_ROOT}/aom_dsp/arm/blend_a64_mask_neon.c"
- #            "${AOM_ROOT}/aom_dsp/arm/avg_pred_neon.c")
++#            "${AOM_ROOT}/aom_dsp/arm/blend_a64_mask_neon.c")
  
  list(APPEND AOM_DSP_COMMON_INTRIN_NEON_DOTPROD
-             "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_neon_dotprod.c")
+             "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_neon_dotprod.c"
+             "${AOM_ROOT}/aom_dsp/arm/aom_scaled_convolve8_neon_dotprod.c")
  
  list(APPEND AOM_DSP_COMMON_INTRIN_NEON_I8MM
-             "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_neon_i8mm.c")
+             "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_neon_i8mm.c"
+             "${AOM_ROOT}/aom_dsp/arm/aom_scaled_convolve8_neon_i8mm.c")
  
  if(CONFIG_AV1_HIGHBITDEPTH)
    list(APPEND AOM_DSP_COMMON_INTRIN_SSE2